]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
Revert "appDisplay: Rename _lastOvershootTimeoutId"
authorJonas Dreßler <verdre@v0yd.nl>
Fri, 9 Dec 2022 19:16:22 +0000 (20:16 +0100)
committerMarge Bot <marge-bot@gnome.org>
Mon, 19 Dec 2022 11:37:58 +0000 (11:37 +0000)
This reverts commit 692de0eb952beabe1ef484dbf341516152378f54.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2581>

js/ui/appDisplay.js

index 8e02e7f85b07e514e6c5f8d9cd2e0df88fa52ed2..ae94a19b5b801d6076fe66a7a67188e52ede729d 100644 (file)
@@ -638,7 +638,7 @@ var BaseAppView = GObject.registerClass({
             () => this._redisplay(), this);
 
         // Drag n' Drop
-        this._overshootTimeoutId = 0;
+        this._lastOvershootTimeoutId = 0;
         this._delayedMoveData = null;
 
         this._dragBeginId = 0;
@@ -839,9 +839,9 @@ var BaseAppView = GObject.registerClass({
     }
 
     _resetOvershoot() {
-        if (this._overshootTimeoutId)
-            GLib.source_remove(this._overshootTimeoutId);
-        this._overshootTimeoutId = 0;
+        if (this._lastOvershootTimeoutId)
+            GLib.source_remove(this._lastOvershootTimeoutId);
+        this._lastOvershootTimeoutId = 0;
     }
 
     _handleDragOvershoot(dragEvent) {
@@ -857,7 +857,7 @@ var BaseAppView = GObject.registerClass({
             return;
         }
 
-        if (this._overshootTimeoutId > 0)
+        if (this._lastOvershootTimeoutId > 0)
             return;
 
         let targetPage;
@@ -869,14 +869,14 @@ var BaseAppView = GObject.registerClass({
         if (targetPage < 0 || targetPage >= this._grid.nPages)
             return; // don't go beyond first/last page
 
-        this._overshootTimeoutId =
+        this._lastOvershootTimeoutId =
             GLib.timeout_add(GLib.PRIORITY_DEFAULT, OVERSHOOT_TIMEOUT, () => {
                 this._resetOvershoot();
                 this.goToPage(targetPage);
                 return GLib.SOURCE_REMOVE;
             });
-        GLib.Source.set_name_by_id(this._overshootTimeoutId,
-            '[gnome-shell] this._overshootTimeoutId');
+        GLib.Source.set_name_by_id(this._lastOvershootTimeoutId,
+            '[gnome-shell] this._lastOvershootTimeoutId');
     }
 
     _onDragBegin() {